Update fugawi styles to include timestamps. From Patrick Ohly.

diff --git a/gpsbabel/README b/gpsbabel/README
index ca4f49141a331de7eef61ca4f437b5266a5aa7ed..d858f61bccd1ba2036b35fa0448fde453df17d30 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -579,8 +579,24 @@ THE FORMATS
 
     Fugawi
 
-       This was a requested CSV format.   It's unknown which version of
-       which software it works with.
+       This was a requested CSV format, *not* the proprietary binary format
+        used by Fugawi. Like any other CSV format, GPSBabel cannot read tracks
+        in this format, but converting a track into it and then importing as
+        track in Fugawi works.
+
+        It is known to work with Fugawi V3.1.4.635. When importing/exporting
+        waypoints, one has to specify the order of fields as follows (names of
+        fields may depend on the language used by Fugawi):
+        - Name
+        - Comment
+        - Description
+        - Latidude
+        - Longitude
+        - Altitude (metres)
+        - Date (yyyymmdd/yymmdd)
+        - Time of day (hhmmss)
+        When importing tracks, use "[ignore]" instead of "Name", "Comment" and
+        "Description".
 
        http://www.fugawi.com/
 

diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c
index e588d914f521b72bf8ad9a7e085cef9e4373e66e..269b025373f058bfad43261af8f55cb0895c9d44 100644 (file)
--- a/gpsbabel/internal_styles.c
+++ b/gpsbabel/internal_styles.c
@@ -141,8 +141,8 @@ static char fugawi[] =
 "# fugawi XCSV style file\n"
 "#\n"
 "# Format: Fugawi\n"
-"# Author: Robert Lipe\n"
-"#   Date: 03/10/2003\n"
+"# Author: Robert Lipe, Patrick Ohly\n"
+"#   Date: 07/24/2005\n"
 "#\n"
 "# \n"
 
@@ -166,7 +166,7 @@ static char fugawi[] =
 "PROLOGUE \\# Waypoint description\n"
 "PROLOGUE \\# Latitude in Degree and decimals (soutern hemisphere has neg. degrees)\n"
 "PROLOGUE \\# Longitude in degree and decimals (neg. numbers: west of Greenwich)\n"
-"PROLOGUE \\# Height in meters\n"
+"PROLOGUE \\# Height in meters [optional when importing, always present when exporting: Date (GMT) as ISO YYYYMMDD, Time of the day relative to the date as HHMMSS\n"
 
 "#\n"
 "# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n"
@@ -177,6 +177,8 @@ static char fugawi[] =
 "IFIELD        LAT_DECIMAL, \"\", \"%-.7f\"\n"
 "IFIELD        LON_DECIMAL, \"\", \"%-.7f\"\n"
 "IFIELD        ALT_METERS, \"\", \"%-7.1f\"\n"
+"IFIELD  GMT_TIME, \"\", \"%Y%m%d\"\n"
+"IFIELD  HMSG_TIME, \"\", \"%02d%02d%02d\"\n"
 ;
 static char gpsdrive[] = 
 "# gpsbabel XCSV style file\n"

diff --git a/gpsbabel/reference/fugawi.notime.txt b/gpsbabel/reference/fugawi.notime.txt
new file mode 100644 (file)
index 0000000..630eef7
--- /dev/null
+++ b/gpsbabel/reference/fugawi.notime.txt
@@ -0,0 +1,19 @@
+# Latitude, Longitude and UTM coordinates are in WGS84 datum
+#
+# Every set of data contains the following:
+#
+# Waypoint name
+# Waypoint comment
+# Waypoint description
+# Latitude in Degree and decimals (soutern hemisphere has neg. degrees)
+# Longitude in degree and decimals (neg. numbers: west of Greenwich)
+# Height in meters
+GCEBB,Mountain Bike Heaven by susy1313,,35.9720333,-87.1347000,0.0
+GC1A37,The Troll by a182pilot & Family,,36.0906833,-86.6795500,0.0
+GC1C2B,Dive Bomber by JoGPS & family,,35.9962667,-86.6201167,0.0
+GC25A9,FOSTER by JoGPS & Family,,36.0384833,-86.6486167,0.0
+GC2723,Logan Lighthouse by JoGps & Family,,36.1121833,-86.7417667,0.0
+GC2B71,Ganier Cache by Susy1313,,36.0640833,-86.7905167,0.0
+GC309F,Shy's Hill by FireFighterEng33,,36.0877667,-86.8097333,0.0
+GC317A,GittyUp by JoGPS / Warner Parks,,36.0575000,-86.8920000,0.0
+GC317D,Inlighting by JoGPS / Warner Parks,,36.0828000,-86.8672833,0.0

diff --git a/gpsbabel/reference/fugawi.ref b/gpsbabel/reference/fugawi.ref
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gpsbabel/reference/fugawi.ref.txt b/gpsbabel/reference/fugawi.ref.txt
new file mode 100644 (file)
index 0000000..7e07be7
--- /dev/null
+++ b/gpsbabel/reference/fugawi.ref.txt
@@ -0,0 +1,19 @@
+# Latitude, Longitude and UTM coordinates are in WGS84 datum
+#
+# Every set of data contains the following:
+#
+# Waypoint name
+# Waypoint comment
+# Waypoint description
+# Latitude in Degree and decimals (soutern hemisphere has neg. degrees)
+# Longitude in degree and decimals (neg. numbers: west of Greenwich)
+# Height in meters [optional when importing, always present when exporting: Date (GMT) as ISO YYYYMMDD, Time of the day relative to the date as HHMMSS
+GCEBB,Mountain Bike Heaven by susy1313,,35.9720333,-87.1347000,0.0    ,19700101,000000
+GC1A37,The Troll by a182pilot & Family,,36.0906833,-86.6795500,0.0    ,19700101,000000
+GC1C2B,Dive Bomber by JoGPS & family,,35.9962667,-86.6201167,0.0    ,19700101,000000
+GC25A9,FOSTER by JoGPS & Family,,36.0384833,-86.6486167,0.0    ,19700101,000000
+GC2723,Logan Lighthouse by JoGps & Family,,36.1121833,-86.7417667,0.0    ,19700101,000000
+GC2B71,Ganier Cache by Susy1313,,36.0640833,-86.7905167,0.0    ,19700101,000000
+GC309F,Shy's Hill by FireFighterEng33,,36.0877667,-86.8097333,0.0    ,19700101,000000
+GC317A,GittyUp by JoGPS / Warner Parks,,36.0575000,-86.8920000,0.0    ,19700101,000000
+GC317D,Inlighting by JoGPS / Warner Parks,,36.0828000,-86.8672833,0.0    ,19700101,000000

diff --git a/gpsbabel/reference/fugawi.time.ref.txt b/gpsbabel/reference/fugawi.time.ref.txt
new file mode 100644 (file)
index 0000000..29d630f
--- /dev/null
+++ b/gpsbabel/reference/fugawi.time.ref.txt
@@ -0,0 +1,16 @@
+# Latitude, Longitude and UTM coordinates are in WGS84 datum
+#
+# Every set of data contains the following:
+#
+# Waypoint name
+# Waypoint comment
+# Waypoint description
+# Latitude in Degree and decimals (soutern hemisphere has neg. degrees)
+# Longitude in degree and decimals (neg. numbers: west of Greenwich)
+# Height in meters [optional when importing, always present when exporting: Date (GMT) as ISO YYYYMMDD, Time of the day relative to the date as HHMMSS
+GCEBB,Mountain Bike Heaven by susy1313,,35.9720333,-87.1347000,0.0    ,19700101,000000
+GC1A37,The Troll by a182pilot & Family,,36.0906833,-86.6795500,0.0    ,19700101,000000
+GC1C2B,Dive Bomber by JoGPS & family,,35.9962667,-86.6201167,0.0    ,19700101,110303
+GC25A9,FOSTER by JoGPS & Family,,36.0384833,-86.6486167,0.0    ,19700101,130405
+GC2723,Logan Lighthouse by JoGps & Family,,36.1121833,-86.7417667,0.0    ,20050102,000000
+GC2B71,Ganier Cache by Susy1313,,36.0640833,-86.7905167,0.0    ,20050102,000001

diff --git a/gpsbabel/reference/fugawi.time.txt b/gpsbabel/reference/fugawi.time.txt
new file mode 100644 (file)
index 0000000..8981db7
--- /dev/null
+++ b/gpsbabel/reference/fugawi.time.txt
@@ -0,0 +1,16 @@
+# Latitude, Longitude and UTM coordinates are in WGS84 datum
+#
+# Every set of data contains the following:
+#
+# Waypoint name
+# Waypoint comment
+# Waypoint description
+# Latitude in Degree and decimals (soutern hemisphere has neg. degrees)
+# Longitude in degree and decimals (neg. numbers: west of Greenwich)
+# Height in meters [optional when importing, always present when exporting: Date (GMT) as ISO YYYYMMDD, Time of the day relative to the date as HHMMSS
+GCEBB,Mountain Bike Heaven by susy1313,,35.9720333,-87.1347000,0.0
+GC1A37,The Troll by a182pilot & Family,,36.0906833,-86.6795500,0.0    ,19700101
+GC1C2B,Dive Bomber by JoGPS & family,,35.9962667,-86.6201167,0.0    ,,110304
+GC25A9,FOSTER by JoGPS & Family,,36.0384833,-86.6486167,0.0    ,19700101,130405
+GC2723,Logan Lighthouse by JoGps & Family,,36.1121833,-86.7417667,0.0    ,20050102,000000
+GC2B71,Ganier Cache by Susy1313,,36.0640833,-86.7905167,0.0    ,20050102,000001

diff --git a/gpsbabel/reference/track/fugawi.txt b/gpsbabel/reference/track/fugawi.txt
new file mode 100644 (file)
index 0000000..8bca8dc
--- /dev/null
+++ b/gpsbabel/reference/track/fugawi.txt
@@ -0,0 +1,74 @@
+# Latitude, Longitude and UTM coordinates are in WGS84 datum
+#
+# Every set of data contains the following:
+#
+# Waypoint name
+# Waypoint comment
+# Waypoint description
+# Latitude in Degree and decimals (soutern hemisphere has neg. degrees)
+# Longitude in degree and decimals (neg. numbers: west of Greenwich)
+# Height in meters [optional when importing, always present when exporting: Date (GMT) as ISO YYYYMMDD, Time of the day relative to the date as HHMMSS
+RPT001,RPT001,,30.0621833,-91.6103500,1.0    ,20020525,170621
+RPT002,RPT002,,30.0627833,-91.6105667,0.0    ,20020525,170955
+RPT003,RPT003,,30.0627000,-91.6082667,0.0    ,20020525,171200
+RPT004,RPT004,,30.0623333,-91.6073833,0.0    ,20020525,171248
+RPT005,RPT005,,30.0615333,-91.6052833,0.0    ,20020525,171441
+RPT006,RPT006,,30.0597833,-91.5994000,0.0    ,20020525,171716
+RPT007,RPT007,,30.0578000,-91.5966833,0.0    ,20020525,171746
+RPT008,RPT008,,30.0553833,-91.5949000,0.0    ,20020525,171820
+RPT009,RPT009,,30.0538833,-91.5926167,0.0    ,20020525,171901
+RPT010,RPT010,,30.0497333,-91.5897500,0.0    ,20020525,172046
+RPT011,RPT011,,30.0490167,-91.5898833,0.0    ,20020525,172110
+RPT012,RPT012,,30.0488000,-91.5929333,0.0    ,20020525,172151
+RPT013,RPT013,,30.0462333,-91.5964500,0.0    ,20020525,172235
+RPT014,RPT014,,30.0455167,-91.5987167,0.0    ,20020525,172308
+RPT015,RPT015,,30.0473000,-91.6002667,0.0    ,20020525,180423
+RPT016,RPT016,,30.0470000,-91.5996333,2.0    ,20020525,180604
+RPT017,RPT017,,30.0464333,-91.5994667,0.0    ,20020525,180706
+RPT018,RPT018,,30.0462000,-91.5989500,1.0    ,20020525,180818
+RPT019,RPT019,,30.0463667,-91.5977333,0.0    ,20020525,181020
+RPT020,RPT020,,30.0463500,-91.5971667,0.0    ,20020525,181109
+RPT021,RPT021,,30.0467833,-91.5963333,0.0    ,20020525,181218
+RPT022,RPT022,,30.0474500,-91.5952000,0.0    ,20020525,181422
+RPT023,RPT023,,30.0478000,-91.5947667,2.0    ,20020525,181504
+RPT024,RPT024,,30.0482500,-91.5940833,1.0    ,20020525,181614
+RPT025,RPT025,,30.0486833,-91.5938000,1.0    ,20020525,181701
+RPT026,RPT026,,30.0493500,-91.5938500,0.0    ,20020525,181807
+RPT027,RPT027,,30.0503167,-91.5939833,2.0    ,20020525,181951
+RPT028,RPT028,,30.0507833,-91.5941167,0.0    ,20020525,182039
+RPT029,RPT029,,30.0512333,-91.5943667,0.0    ,20020525,182124
+RPT030,RPT030,,30.0518000,-91.5943667,0.0    ,20020525,182217
+RPT031,RPT031,,30.0522167,-91.5946667,0.0    ,20020525,182318
+RPT032,RPT032,,30.0530167,-91.5946833,0.0    ,20020525,182437
+RPT033,RPT033,,30.0548667,-91.5952000,6.0    ,20020525,182813
+RPT034,RPT034,,30.0537333,-91.5949333,2.0    ,20020525,183136
+RPT035,RPT035,,30.0531833,-91.5947833,0.0    ,20020525,183256
+RPT036,RPT036,,30.0526333,-91.5948333,0.0    ,20020525,183402
+RPT037,RPT037,,30.0524500,-91.5954333,0.0    ,20020525,183603
+RPT038,RPT038,,30.0524833,-91.5959667,0.0    ,20020525,183648
+RPT039,RPT039,,30.0526500,-91.5967833,1.0    ,20020525,183752
+RPT040,RPT040,,30.0531333,-91.5978500,0.0    ,20020525,183918
+RPT041,RPT041,,30.0536167,-91.5979667,0.0    ,20020525,184015
+RPT042,RPT042,,30.0539667,-91.5977667,6.0    ,20020525,184125
+RPT043,RPT043,,30.0536167,-91.5980833,0.0    ,20020525,184237
+RPT044,RPT044,,30.0532000,-91.5979167,0.0    ,20020525,184401
+RPT045,RPT045,,30.0528167,-91.5975167,0.0    ,20020525,184553
+RPT046,RPT046,,30.0525667,-91.5969333,0.0    ,20020525,184654
+RPT047,RPT047,,30.0523333,-91.5964333,0.0    ,20020525,184742
+RPT048,RPT048,,30.0522500,-91.5956833,0.0    ,20020525,184841
+RPT049,RPT049,,30.0522167,-91.5950167,0.0    ,20020525,184952
+RPT050,RPT050,,30.0518833,-91.5947000,0.0    ,20020525,185049
+RPT051,RPT051,,30.0510500,-91.5944000,0.0    ,20020525,185214
+RPT052,RPT052,,30.0505667,-91.5942333,0.0    ,20020525,185256
+RPT053,RPT053,,30.0501833,-91.5941000,0.0    ,20020525,185338
+RPT054,RPT054,,30.0491000,-91.5937167,0.0    ,20020525,185511
+RPT055,RPT055,,30.0484500,-91.5942500,0.0    ,20020525,185632
+RPT056,RPT056,,30.0480833,-91.5947500,0.0    ,20020525,185724
+RPT057,RPT057,,30.0475000,-91.5954500,7.0    ,20020525,185840
+RPT058,RPT058,,30.0470667,-91.5960000,0.0    ,20020525,185928
+RPT059,RPT059,,30.0466333,-91.5966000,0.0    ,20020525,190022
+RPT060,RPT060,,30.0464000,-91.5976500,0.0    ,20020525,190141
+RPT061,RPT061,,30.0462333,-91.5984667,0.0    ,20020525,190248
+RPT062,RPT062,,30.0463167,-91.5989667,0.0    ,20020525,190343
+RPT063,RPT063,,30.0467833,-91.5992833,0.0    ,20020525,190449
+RPT064,RPT064,,30.0471333,-91.5996667,0.0    ,20020525,190557

diff --git a/gpsbabel/style/fugawi.style b/gpsbabel/style/fugawi.style
index 9a03c35faf9b238f623b0089bdf957e052fe30aa..e47b38966507f537970c319b94740b993e35cf32 100644 (file)
--- a/gpsbabel/style/fugawi.style
+++ b/gpsbabel/style/fugawi.style
@@ -1,8 +1,8 @@
 # fugawi XCSV style file
 #
 # Format: Fugawi
-# Author: Robert Lipe
-#   Date: 03/10/2003
+# Author: Robert Lipe, Patrick Ohly
+#   Date: 07/24/2005
 #
 # 
 
@@ -26,7 +26,7 @@ PROLOGUE \# Waypoint comment
 PROLOGUE \# Waypoint description
 PROLOGUE \# Latitude in Degree and decimals (soutern hemisphere has neg. degrees)
 PROLOGUE \# Longitude in degree and decimals (neg. numbers: west of Greenwich)
-PROLOGUE \# Height in meters
+PROLOGUE \# Height in meters [optional when importing, always present when exporting: Date (GMT) as ISO YYYYMMDD, Time of the day relative to the date as HHMMSS
 
 #
 # INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
@@ -37,3 +37,5 @@ IFIELD        NOTES, "", "%s"
 IFIELD LAT_DECIMAL, "", "%-.7f"
 IFIELD LON_DECIMAL, "", "%-.7f"
 IFIELD ALT_METERS, "", "%-7.1f"
+IFIELD  GMT_TIME, "", "%Y%m%d"
+IFIELD  HMSG_TIME, "", "%02d%02d%02d"

diff --git a/gpsbabel/testo b/gpsbabel/testo
index 058374f91b0fc8a6466d3ba3c04d722694b519e0..19832b75f88c0e929e6ab013c07e3f1aa2310050 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -795,4 +795,18 @@ compare ${TMPDIR}/dop-vdop.ref ${TMPDIR}/dop-vdop.fil
 # ${PNAME} -i gpx -f reference/cototestmarker.gpx -o coto -F ${TMPDIR}/cotomarker.pdb
 # compare reference/cototestmarker.pdb ${TMPDIR}/cotomarker.pdb
 
+#
+# Fugawi test cases
+rm -f ${TMPDIR}/fugawi*
+${PNAME}  -i fugawi -f reference/fugawi.notime.txt -o fugawi -F ${TMPDIR}/fugawi1.txt
+compare reference/fugawi.ref.txt ${TMPDIR}/fugawi1.txt
+${PNAME}  -i geo -f geocaching.loc -o fugawi -F ${TMPDIR}/fugawi2.txt
+compare reference/fugawi.ref.txt ${TMPDIR}/fugawi2.txt
+${PNAME}  -i fugawi -f ${TMPDIR}/fugawi2.txt -o fugawi -F ${TMPDIR}/fugawi3.txt
+compare ${TMPDIR}/fugawi2.txt ${TMPDIR}/fugawi3.txt
+${PNAME}  -i fugawi -f reference/fugawi.time.txt  -o fugawi -F ${TMPDIR}/fugawi4.txt
+compare reference/fugawi.time.ref.txt ${TMPDIR}/fugawi4.txt
+${PNAME} -i gpx -f reference/track/tracks.gpx  -o fugawi -F ${TMPDIR}/fugawi5.txt
+compare reference/track/fugawi.txt ${TMPDIR}/fugawi5.txt
+
 exit 0